From 775b42ef92ec97e93a9f59ab99ad2e842d7c6b8d Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 28 Oct 2016 06:47:26 -0400 Subject: [PATCH] Revert "Convert GtkEntry to indirect rendering" This reverts commit 8e29222d95449278d66f3e067d7dc1dcb7f6dcae. This needs more work - spin buttons need to be converted at the same time, and we should make sure that text still appears. --- gtk/gtkentry.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c index 3227d47e33..2f91597355 100644 --- a/gtk/gtkentry.c +++ b/gtk/gtkentry.c @@ -414,8 +414,8 @@ static void gtk_entry_map (GtkWidget *widget); static void gtk_entry_unmap (GtkWidget *widget); static void gtk_entry_size_allocate (GtkWidget *widget, GtkAllocation *allocation); -static GskRenderNode *gtk_entry_get_render_node (GtkWidget *widget, - GskRenderer *renderer); +static gint gtk_entry_draw (GtkWidget *widget, + cairo_t *cr); static gboolean gtk_entry_event (GtkWidget *widget, GdkEvent *event); static gint gtk_entry_enter_notify (GtkWidget *widget, @@ -761,7 +761,7 @@ gtk_entry_class_init (GtkEntryClass *class) widget_class->unrealize = gtk_entry_unrealize; widget_class->measure = gtk_entry_measure_; widget_class->size_allocate = gtk_entry_size_allocate; - widget_class->get_render_node = gtk_entry_get_render_node; + widget_class->draw = gtk_entry_draw; widget_class->enter_notify_event = gtk_entry_enter_notify; widget_class->leave_notify_event = gtk_entry_leave_notify; widget_class->event = gtk_entry_event; @@ -3591,11 +3591,13 @@ should_prelight (GtkEntry *entry, return TRUE; } -static GskRenderNode * -gtk_entry_get_render_node (GtkWidget *widget, - GskRenderer *renderer) +static gboolean +gtk_entry_draw (GtkWidget *widget, + cairo_t *cr) { - return gtk_css_gadget_get_render_node (GTK_ENTRY (widget)->priv->gadget, renderer, FALSE); + gtk_css_gadget_draw (GTK_ENTRY (widget)->priv->gadget, cr); + + return GDK_EVENT_PROPAGATE; } #define UNDERSHOOT_SIZE 20 -- 2.30.2